From 17035d51e298a50544901ef3e771d58de984bcb9 Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 14 Sep 2004 14:30:38 +0000 Subject: [PATCH] Cope with serial and usb packets being different size. --- gpsbabel/jeeps/gpsmem.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gpsbabel/jeeps/gpsmem.c b/gpsbabel/jeeps/gpsmem.c index 5635adbc0..8712fecdc 100644 --- a/gpsbabel/jeeps/gpsmem.c +++ b/gpsbabel/jeeps/gpsmem.c @@ -23,12 +23,12 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" +#include "garminusb.h" #include #include #include #include - /* @func GPS_Packet_New *********************************************** ** ** Packet constructor @@ -39,15 +39,14 @@ GPS_PPacket GPS_Packet_New(void) { GPS_PPacket ret; - - if(!(ret=(GPS_PPacket )malloc(sizeof(GPS_OPacket)))) + int hdr_size = gps_is_usb ? sizeof(garmin_usb_packet) : sizeof sizeof(GPS_OPacket) ; + if(!(ret=(GPS_PPacket )malloc(hdr_size))) { perror("malloc"); fprintf(stderr,"GPS_Packet_New: Insufficient memory"); fflush(stderr); return NULL; } - if(!(ret->data = (UC *)malloc(MAX_GPS_PACKET_SIZE*sizeof(UC)))) { perror("malloc"); -- 2.30.2